From: Kan-Ru Chen <koster@debian.org>
Date: Sat, 17 Dec 2011 08:37:02 +0000 (+0800)
Subject: Merge commit 'upstream/0.3.0'
X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~227
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=997b9ae3e1e825f4bd7cd0ca3965dd8d8a624910;p=opencc.git

Merge commit 'upstream/0.3.0'
---

997b9ae3e1e825f4bd7cd0ca3965dd8d8a624910